Skip to content

[bot] Merge 26.3 to develop (Conflicts)#1391

Merged
github-actions[bot] merged 7 commits into
developfrom
fb_bot_merge_26.3
May 27, 2026
Merged

[bot] Merge 26.3 to develop (Conflicts)#1391
github-actions[bot] merged 7 commits into
developfrom
fb_bot_merge_26.3

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

Automatic merge failed! Please merge 26.3 into fb_bot_merge_26.3 and resolve conflicts manually.

git fetch
git checkout fb_bot_merge_26.3
git reset --hard origin/develop
git merge 8d5d0b6bc86e38c5975e3d965e59b118e29ad202 -m "Merge 26.3 to develop"

Resolve all conflicts (using IntelliJ or git mergetool)

git commit
git push --force

Approve all matching PRs simultaneously.
Approval will trigger automatic merge.
Verify all PRs before approving: https://internal.labkey.com/Scrumtime/Backlog/harvest-gitOpenPullRequests.view?branch=fb_bot_merge_26.3

@github-actions github-actions Bot merged commit ad2a457 into develop May 27, 2026
8 checks passed
@github-actions github-actions Bot deleted the fb_bot_merge_26.3 branch May 27, 2026 01:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants